Change tests to support rustc wording changes
#14341
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Between rust-lang/rust#126810 and rust-lang/rust#126810 the output of rustc for resolution errors is going to change in such a way that some existing cargo tests will fail. Change them to support both the current and future output, so that those PRs can land in `rustc`.
rustbot
added
the
S-waiting-on-review
weihanglo
approved these changes
Aug 1, 2024
|
@weihanglo no problem! It's a shame that we have to deal with a complex multi-repo relationship, but at the same time I prefer the mild annoyance over uncaught unintended mistakes. :) |
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 3, 2024
Update cargo 15 commits in 257b72b8adfb1f2aa9916cefca67285c21666276..fa646583675d7c140482bd906145c71b7fb4fc2b 2024-07-30 15:08:27 +0000 to 2024-08-02 16:08:06 +0000 - refactor(toml): Rename 'resolved' to 'normalized' (rust-lang/cargo#14342) - faq: rephrase offline usage. (rust-lang/cargo#14336) - docs(unstable): Improve nightly link (rust-lang/cargo#14344) - Fix a typo in 1.81 changes (rust-lang/cargo#14343) - Change tests to support `rustc` wording changes (rust-lang/cargo#14341) - chore(deps): update rust crate windows-sys to 0.59 (rust-lang/cargo#14335) - chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14332) - chore(deps): update compatible (rust-lang/cargo#14331) - chore(deps): update rust crate rusqlite to 0.32.0 (rust-lang/cargo#14334) - fix: also build manpage for cargo.md (rust-lang/cargo#14339) - fix(config): Adjust MSRV resolve config field name / values (rust-lang/cargo#14296) - fix(toml): Resolve regression from toml_edit 0.22.18 (rust-lang/cargo#14329) - test(publish): More dev-dep stripping cases (rust-lang/cargo#14327) - Use gmake on AIX (rust-lang/cargo#14323) - fix(publish): Don't strip non-dev features (rust-lang/cargo#14325) r? ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With rust-lang/rust#126818 the output of rustc for resolution errors is going to change in such a way that some existing cargo tests will fail. Change them to support both the current and future output, so that those PRs can land in
rustc. Follow up to #14135. Noticed in https://github.com/rust-lang-ci/rust/actions/runs/10192263962/job/28194880547#step:25:7529 when trying to land rust-lang/rust#126818.